From 74e88267938349fdb293c0d3d9222122e1cbc4d0 Mon Sep 17 00:00:00 2001 From: Owen Taylor Date: Tue, 8 Jan 2002 19:56:37 +0000 Subject: [PATCH] Don't draw the handle if we aren't showing both children. (#68135, Diego Tue Jan 8 14:51:19 2002 Owen Taylor * gtk/gtkpaned.c (gtk_paned_expose): Don't draw the handle if we aren't showing both children. (#68135, Diego Gonzalez) --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtkpaned.c | 8 ++++---- 8 files changed, 39 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9311855e75..b8c63e0f18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Jan 8 14:51:19 2002 Owen Taylor + + * gtk/gtkpaned.c (gtk_paned_expose): Don't draw + the handle if we aren't showing both children. + Tue Jan 8 14:45:43 2002 Owen Taylor * gtk/gtkwidget.c (gtk_widget_add_events): Fix diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 9311855e75..b8c63e0f18 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +Tue Jan 8 14:51:19 2002 Owen Taylor + + * gtk/gtkpaned.c (gtk_paned_expose): Don't draw + the handle if we aren't showing both children. + Tue Jan 8 14:45:43 2002 Owen Taylor * gtk/gtkwidget.c (gtk_widget_add_events): Fix diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 9311855e75..b8c63e0f18 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +Tue Jan 8 14:51:19 2002 Owen Taylor + + * gtk/gtkpaned.c (gtk_paned_expose): Don't draw + the handle if we aren't showing both children. + Tue Jan 8 14:45:43 2002 Owen Taylor * gtk/gtkwidget.c (gtk_widget_add_events): Fix diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 9311855e75..b8c63e0f18 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +Tue Jan 8 14:51:19 2002 Owen Taylor + + * gtk/gtkpaned.c (gtk_paned_expose): Don't draw + the handle if we aren't showing both children. + Tue Jan 8 14:45:43 2002 Owen Taylor * gtk/gtkwidget.c (gtk_widget_add_events): Fix diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 9311855e75..b8c63e0f18 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +Tue Jan 8 14:51:19 2002 Owen Taylor + + * gtk/gtkpaned.c (gtk_paned_expose): Don't draw + the handle if we aren't showing both children. + Tue Jan 8 14:45:43 2002 Owen Taylor * gtk/gtkwidget.c (gtk_widget_add_events): Fix diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 9311855e75..b8c63e0f18 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +Tue Jan 8 14:51:19 2002 Owen Taylor + + * gtk/gtkpaned.c (gtk_paned_expose): Don't draw + the handle if we aren't showing both children. + Tue Jan 8 14:45:43 2002 Owen Taylor * gtk/gtkwidget.c (gtk_widget_add_events): Fix diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 9311855e75..b8c63e0f18 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +Tue Jan 8 14:51:19 2002 Owen Taylor + + * gtk/gtkpaned.c (gtk_paned_expose): Don't draw + the handle if we aren't showing both children. + Tue Jan 8 14:45:43 2002 Owen Taylor * gtk/gtkwidget.c (gtk_widget_add_events): Fix diff --git a/gtk/gtkpaned.c b/gtk/gtkpaned.c index 71be0ca818..a4b3bc7b9c 100644 --- a/gtk/gtkpaned.c +++ b/gtk/gtkpaned.c @@ -310,16 +310,16 @@ static gint gtk_paned_expose (GtkWidget *widget, GdkEventExpose *event) { - GtkPaned *paned; + GtkPaned *paned = GTK_PANED (widget); g_return_val_if_fail (GTK_IS_PANED (widget), FALSE); - if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget)) + if (GTK_WIDGET_VISIBLE (widget) && GTK_WIDGET_MAPPED (widget) && + paned->child1 && GTK_WIDGET_VISIBLE (paned->child1) && + paned->child2 && GTK_WIDGET_VISIBLE (paned->child2)) { GdkRegion *region; - paned = GTK_PANED (widget); - region = gdk_region_rectangle (&paned->handle_pos); gdk_region_intersect (region, event->region); -- 2.30.2